Remove wanda

It's been broken for quite a bit since we removed Panel.Animation,
and hasn't really ever worked with our new search results. It's also
the only non-remote provider left.

Maybe we'll add it back as a remote provider later, but for now, just
ditch it.

diff --git a/data/Makefile.am b/data/Makefile.am
index 13df74ef32108112188dc75b7da45041033766f4..4f91709d6385bb32b5d5ce08017c487b4e31495b 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,3 @@
-wandadir = $(pkgdatadir)
-dist_wanda_DATA = wanda.png
-
 desktopdir=$(datadir)/applications
 desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 if HAVE_MUTTER_WAYLAND

diff --git a/data/wanda.png b/data/wanda.png
deleted file mode 100644 (file)
index d56a4d4..0000000
Binary files a/data/wanda.png and /dev/null differ

diff --git a/js/Makefile.am b/js/Makefile.am
index d614f4fc095c6a392522e20f051f40f72f13a203..4fdbae8aae1d1a8cb29cbd7792cdd06d925e69b1 100644 (file)
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -107,7 +107,6 @@ nobase_dist_js_DATA =       \
        ui/unlockDialog.js      \
        ui/userWidget.js        \
        ui/viewSelector.js      \
-       ui/wanda.js             \
        ui/windowAttentionHandler.js    \
        ui/windowManager.js     \
        ui/workspace.js         \

diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 3cfa5cdbb8057e658371e513cccc081fcadfa015..9e86288ec522ae3728251a028f6c2b3df408a5bf 100644 (file)
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -19,7 +19,6 @@ const Search = imports.ui.search;
 const SearchDisplay = imports.ui.searchDisplay;
 const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
-const Wanda = imports.ui.wanda;
 const WorkspacesView = imports.ui.workspacesView;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
@@ -114,8 +113,6 @@ const ViewSelector = new Lang.Class({
         this._searchSettings.connect('changed::sort-order', Lang.bind(this, this._reloadRemoteProviders));
 
         // Default search providers
-        // Wanda comes obviously first
-        this.addSearchProvider(new Wanda.WandaSearchProvider());
         this.addSearchProvider(new AppDisplay.AppSearchProvider());
 
         // Load remote search providers provided by applications

diff --git a/js/ui/wanda.js b/js/ui/wanda.js
deleted file mode 100644 (file)
index 6ed2387..0000000
--- a/js/ui/wanda.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
-const Lang = imports.lang;
-const St = imports.gi.St;
-
-const IconGrid = imports.ui.iconGrid;
-const Layout = imports.ui.layout;
-const Main = imports.ui.main;
-const Panel = imports.ui.panel;
-
-const FISH_NAME = 'wanda';
-const FISH_FILENAME = 'wanda.png';
-const FISH_SPEED = 300;
-const FISH_COMMAND = 'fortune';
-// The size of an individual frame in the animation
-const FISH_HEIGHT = 22;
-const FISH_WIDTH = 36;
-
-const FISH_GROUP = 'Fish Animation';
-
-const MAGIC_FISH_KEY = 'free the fish';
-
-const WandaIcon = new Lang.Class({
-    Name: 'WandaIcon',
-    Extends: IconGrid.BaseIcon,
-
-    _init : function(fish, label, params) {
-        this.parent(label, params);
-
-        this._fish = fish;
-        this._imageFile = GLib.build_filenamev([global.datadir, fish + '.png']);
-
-        this._imgHeight = FISH_HEIGHT;
-        this._imgWidth = FISH_WIDTH;
-    },
-
-    createIcon: function(iconSize) {
-        this._animations = new Panel.Animation(this._imageFile, this._imgWidth, this._imgHeight, FISH_SPEED);
-        this._animations.play();
-        return this._animations.actor;
-    },
-
-    _createIconTexture: function(size) {
-        if (size == this.iconSize)
-            return;
-
-        this.parent(size);
-    }
-});
-
-const WandaIconBin = new Lang.Class({
-    Name: 'WandaIconBin',
-
-    _init: function(fish, label, params) {
-        this.actor = new St.Bin({ reactive: true,
-                                  track_hover: true });
-        this.icon = new WandaIcon(fish, label, params);
-
-        this.actor.child = this.icon.actor;
-        this.actor.label_actor = this.icon.label;
-    },
-});
-
-const FortuneDialog = new Lang.Class({
-    Name: 'FortuneDialog',
-
-    _init: function(name, command) {
-        let text;
-
-        try {
-            let [res, stdout, stderr, status] = GLib.spawn_command_line_sync(command);
-            text = String.fromCharCode.apply(null, stdout);
-        } catch(e) {
-            text = _("Sorry, no wisdom for you today:\n%s").format(e.message);
-        }
-
-        this._title = new St.Label({ style_class: 'prompt-dialog-headline',
-                                     text: _("%s the Oracle says").format(name) });
-        this._label = new St.Label({ style_class: 'prompt-dialog-description',
-                                     text: text });
-        this._label.clutter_text.line_wrap = true;
-
-        this._box = new St.BoxLayout({ vertical: true,
-                                       style_class: 'prompt-dialog' // this is just to force a reasonable width
-                                     });
-        this._box.add(this._title, { align: St.Align.MIDDLE });
-        this._box.add(this._label, { expand: true });
-
-        this._button = new St.Button({ button_mask: St.ButtonMask.ONE,
-                                       style_class: 'modal-dialog',
-                                       reactive: true });
-        this._button.connect('clicked', Lang.bind(this, this.destroy));
-        this._button.child = this._box;
-
-        this._bin = new St.Bin({ x_align: St.Align.MIDDLE,
-                                 y_align: St.Align.MIDDLE });
-        this._bin.add_constraint(new Layout.MonitorConstraint({ primary: true }));
-        this._bin.add_actor(this._button);
-
-        Main.layoutManager.addChrome(this._bin);
-
-        GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 10, Lang.bind(this, this.destroy));
-    },
-
-    destroy: function() {
-        this._bin.destroy();
-    }
-});
-
-function capitalize(str) {
-    return str[0].toUpperCase() + str.substring(1, str.length);
-}
-
-const WandaSearchProvider = new Lang.Class({
-    Name: 'WandaSearchProvider',
-
-    _init: function() {
-        this.id = 'wanda';
-    },
-
-    getResultMetas: function(fish, callback) {
-        callback([{ 'id': fish[0], // there may be many fish in the sea, but
-                    // only one which speaks the truth!
-                    'name': capitalize(fish[0]),
-                    'createIcon': function(iconSize) {
-                        return new St.Icon({ gicon: Gio.icon_new_for_string('face-smile'),
-                                             icon_size: iconSize });
-                    }
-                  }]);
-    },
-
-    filterResults: function(results) {
-        return results;
-    },
-
-    getInitialResultSet: function(terms) {
-        if (terms.join(' ') == MAGIC_FISH_KEY) {
-            this.searchSystem.setResults(this, [ FISH_NAME ]);
-        } else {
-            this.searchSystem.setResults(this, []);
-        }
-    },
-
-    getSubsearchResultSet: function(previousResults, terms) {
-        this.getInitialResultSet(terms);
-    },
-
-    activateResult: function(fish) {
-        if (this._dialog)
-            this._dialog.destroy();
-        this._dialog = new FortuneDialog(capitalize(fish), FISH_COMMAND);
-    },
-
-    createResultObject: function (resultMeta, terms) {
-        return new WandaIconBin(resultMeta.id, resultMeta.name);
-    }
-});

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c8fe2fdb0ca8715a2cdc3124f177dedadb6cff4e..6ec28e757c38c05f77376b5e4df5bc99596c5cb7 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,7 +52,6 @@ js/ui/status/system.js
 js/ui/status/volume.js
 js/ui/unlockDialog.js
 js/ui/viewSelector.js
-js/ui/wanda.js
 js/ui/windowAttentionHandler.js
 js/ui/windowManager.js
 src/calendar-server/evolution-calendar.desktop.in.in